From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Sun, 17 Jan 2010 21:57:00 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8462^2~48
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=14c80086497b1330d92d3fb6e5cdbeb7b905b2b3;p=emacs.git

Merge from mainline.
---

14c80086497b1330d92d3fb6e5cdbeb7b905b2b3